From: Julien Danjou Date: Wed, 13 Oct 2010 11:55:48 +0000 (+0000) Subject: shr: make shr-width a defcustom, use it in shr-tag-img. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6097 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a47df6cd8d12c836742da9ad1ad7b26ec5989179;p=emacs.git shr: make shr-width a defcustom, use it in shr-tag-img. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 119553d0286..e001688a91b 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2010-10-13 Julien Danjou + + * shr.el (shr-width): Make shr-width a defcustom with default to + fill-column. + (shr-tag-img): Use shr-width rather than fill-column. + 2010-10-13 Katsumi Yamaoka * gnus-dired.el (gnus-dired-attach): Silence XEmacs 21.5 when compiling. diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 03c0ec84d5d..8a0e814bca3 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -68,14 +68,16 @@ fit these criteria." :group 'shr :type 'char) +(defcustom shr-width fill-column + "Frame width to use for rendering." + :type 'integer + :group 'shr) + (defvar shr-content-function nil "If bound, this should be a function that will return the content. This is used for cid: URLs, and the function is called with the cid: URL as the argument.") -(defvar shr-width 70 - "Frame width to use for rendering.") - ;;; Internal variables. (defvar shr-folding-mode nil) @@ -404,7 +406,7 @@ Return a string with image data." (when width ;; Check that width is not larger than max width, otherwise ignore ;; align - (let ((max-width (* fill-column (frame-char-width))) + (let ((max-width (* shr-width (frame-char-width))) (width (string-to-number width))) (when (< width max-width) (let ((align (cdr (assq :align cont))))